2366e73702c767e434afaec9b637bacf9e013e11,portal-impl/src/com/liferay/portlet/communities/action/EditPagesAction.java,EditPagesAction,updateLayout,#PageForm#ActionRequest#,413

Before Change



			// Add layout

			Layout layout = LayoutServiceUtil.addLayout(
				groupId, privateLayout, parentLayoutId, name, title, type,
				hidden, friendlyURL);

			if (type.equals(LayoutImpl.TYPE_PORTLET)) {
				LayoutTypePortlet layoutTypePortlet =

After Change


			Layout layout = null;
			Layout parentLayout = null;
			
			if (inheritFromParent && parentLayoutId > 0) {
				parentLayout = LayoutLocalServiceUtil.getLayout(
						groupId, privateLayout, parentLayoutId);

				layout = LayoutServiceUtil.addLayout(
						groupId, privateLayout, parentLayoutId, name, title, 
						parentLayout.getType(), parentLayout.isHidden(), friendlyURL);
				
				LayoutServiceUtil.updateLayout(
						layout.getGroupId(), layout.isPrivateLayout(),
						layout.getLayoutId(), parentLayout.getTypeSettings());				
			}
			else {
				layout = LayoutServiceUtil.addLayout(
						groupId, privateLayout, parentLayoutId, name, title, type,
						hidden, friendlyURL);

				if (type.equals(LayoutImpl.TYPE_PORTLET)) {
					LayoutTypePortlet layoutTypePortlet =